Auto merge of #2077 - Lechindianer:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 22 Oct 2015 21:59:36 +0000 (21:59 +0000)
committerbors <bors@rust-lang.org>
Thu, 22 Oct 2015 21:59:36 +0000 (21:59 +0000)
Just a simple fix


Trivial merge